From f8a685ad57b8d03442b1a96b91d8e27a84994533 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 12 Nov 2009 11:42:02 +0000 Subject: [PATCH] A few trivial cleanups Alphabetize object files and guest config options for better readability. Also remove svm interrupt prototypes which do not exist. Signed-off-by: Christoph Egger --- tools/python/xen/xm/create.py | 30 +++++++++++++++++++++--------- xen/arch/x86/hvm/Makefile | 12 ++++++------ xen/include/asm-x86/hvm/svm/intr.h | 5 +---- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index c62c86b5c6..d6485a59a1 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -994,15 +994,27 @@ def configure_vifs(config_devs, vals): def configure_hvm(config_image, vals): """Create the config for HVM devices. """ - args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb', 'timer_mode', - 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw', - 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten', - 'sdl', 'display', 'xauthority', 'rtc_timeoffset', 'monitor', - 'acpi', 'apic', 'usb', 'usbdevice', 'keymap', 'pci', 'hpet', - 'guest_os_type', 'hap', 'oos', 'opengl', 'cpuid', 'cpuid_check', - 'viridian', 'xen_extended_power_mgmt', 'pci_msitranslate', - 'vpt_align', 'pci_power_mgmt', 'xen_platform_pci', - 'gfx_passthru', 'description' ] + args = [ 'acpi', 'apic', + 'boot', + 'cpuid', 'cpuid_check', + 'description', 'device_model', 'display', + 'fda', 'fdb', + 'gfx_passthru', 'guest_os_type', + 'hap', 'hpet', + 'isa', + 'keymap', + 'localtime', + 'monitor', + 'nographic', + 'opengl', 'oos', + 'pae', 'pci', 'pci_msitranslate', 'pci_power_mgmt', + 'rtc_timeoffset', + 'sdl', 'serial', 'soundhw', 'stdvga', + 'timer_mode', + 'usb', 'usbdevice', + 'vcpus', 'vnc', 'vncconsole', 'vncdisplay', 'vnclisten', + 'vncunused', 'viridian', 'vpt_align', + 'xauthority', 'xen_extended_power_mgmt', 'xen_platform_pci' ] for a in args: if a in vals.__dict__ and vals.__dict__[a] is not None: diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index 7d8fad698b..fe6150b236 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -2,6 +2,7 @@ subdir-y += svm subdir-y += vmx obj-y += emulate.o +obj-y += hpet.o obj-y += hvm.o obj-y += i8254.o obj-y += intercept.o @@ -11,12 +12,11 @@ obj-y += mtrr.o obj-y += pmtimer.o obj-y += quirks.o obj-y += rtc.o -obj-y += hpet.o -obj-y += vpt.o -obj-y += vioapic.o -obj-y += vlapic.o -obj-y += vpic.o obj-y += save.o -obj-y += vmsi.o obj-y += stdvga.o +obj-y += vioapic.o obj-y += viridian.o +obj-y += vlapic.o +obj-y += vmsi.o +obj-y += vpic.o +obj-y += vpt.o diff --git a/xen/include/asm-x86/hvm/svm/intr.h b/xen/include/asm-x86/hvm/svm/intr.h index 11820cea18..4f74151470 100644 --- a/xen/include/asm-x86/hvm/svm/intr.h +++ b/xen/include/asm-x86/hvm/svm/intr.h @@ -21,9 +21,6 @@ #ifndef __ASM_X86_HVM_SVM_INTR_H__ #define __ASM_X86_HVM_SVM_INTR_H__ -extern void svm_intr_assist(void); -extern void svm_intr_assist_update(struct vcpu *v, int highest_vector); -extern void svm_intr_assist_test_valid(struct vcpu *v, - unsigned long *intr_result); +void svm_intr_assist(void); #endif /* __ASM_X86_HVM_SVM_INTR_H__ */ -- 2.30.2